Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Holina/top nav/footer #67

Open
wants to merge 60 commits into
base: master
Choose a base branch
from
Open

Holina/top nav/footer #67

wants to merge 60 commits into from

Conversation

Millington-Holi7
Copy link

No description provided.

Millington-Holi7 and others added 30 commits July 23, 2024 12:01
@Millington-Holi7
Readr tree diagram
6eb713b
@bhood239
set up ruby version and database
d84c25a
@bhood239
update database.yml
2ac81ff
@laraibsshaikh10
ERD
c91fecb
@bhood239
set up filesystem
0153f09
@bhood239
create tables and migrate
cd07028
@bhood239
create basic full crud operations and routes
88bae70
@vyshudoulagar
Make a basic book component without props
4884de0
@vyshudoulagar
Make a basic miniprofile component without props
92e5f16
@vyshudoulagar
Make a basic booklist component
3335cc3
@vyshudoulagar
Add basic props for book and booklist, Add custom rating component
18651ff
@vyshudoulagar
Add props to mini profile
8198349
@bhood239
implement functions to get data from books api
c272228
@bhood239
create useBookData custom hooks
9e7cccf
@vyshudoulagar
Merge pull request #2 from bhood239/ben/database/setup
118534e 
Ben/database/setup
@vyshudoulagar
Merge pull request #1 from bhood239/ben/feature/books_api
513511e 
Ben/feature/books api
@vyshudoulagar
Add necessary comments
938b74e
@vyshudoulagar
Add comments, and update the code in book
73ee22c
@vyshudoulagar
Merge pull request #3 from bhood239/vyshnavi/components/miniprofile
449d5c3 
Vyshnavi/components/miniprofile
@vyshudoulagar
Merge branch 'master' into vyshnavi/components/booklist
4819d1c
@bhood239
Merge pull request #4 from bhood239/vyshnavi/components/booklist
8e83c13 
Vyshnavi/components/booklist
@laraibsshaikh10
Add post and postList components
1cd0127
@laraibsshaikh10
Pulled changes from master
31cd011
@bhood239
begin creating API requests
feb9f91
@bhood239
create book status api requests
3b33f11
@vyshudoulagar
Make searchResult component
7fad6a6
@vyshudoulagar
Add comments
38afd04
@vyshudoulagar
Add props to booklist
3b75398
@laraibsshaikh10
Create postForm
8a272ae
@vyshudoulagar
Add followers and following methods in friends controller
fcc064b
vyshudoulagar and others added 29 commits July 27, 2024 11:05
@vyshudoulagar
create loginform component, add comments in useApplicationData about …
1daa233 
…what more states to add to it
@laraibsshaikh10
Add rating and time_spent in hours
6a2b4a7
@vyshudoulagar
Add loginpage backend controller
0ca011d
@vyshudoulagar
make login and register page demo style and change backend according …
01fcbdd 
…to that
@vyshudoulagar
update form and backend to work on browser, add cors
1ba47b0
@vyshudoulagar
Add functions, hooks in BookList
f698f1c
@bhood239
organize apiRequests into folders
9f962dc
@bhood239
create custom hooks for postData and userdata
feecf5a
@bhood239
create useBookStatus custom hook
0c87e77
@bhood239
create seeds
b8cb0f1
@bhood239
Merge pull request #5 from bhood239/vyshnavi/components/searchResults
68676d9 
Vyshnavi/components/search results
@vyshudoulagar
Make book api return correct data
009d624
@Millington-Holi7
Add Top nav pages
bd63cbf
@Millington-Holi7
merge changes
0372470
@Millington-Holi7
created Top Nav and footer and called them in App.
6a10f06
@laraibsshaikh10
Fix spelling mistake
a7bd100
@laraibsshaikh10
Merge pull request #9 from bhood239/laraib/components/postForm
85b954d 
Laraib/components/post form
@vyshudoulagar
Merge pull request #6 from bhood239/ben/feature/useApiData
edb8616 
Ben/feature/use api data
@bhood239
Revert "Laraib/components/post form"
c5ca186
@bhood239
Merge pull request #10 from bhood239/revert-9-laraib/components/postForm
e143e7c 
Revert "Laraib/components/post form"
@laraibsshaikh10
Change ruby version in gemfile
b2ef7e7
@vyshudoulagar
Merge branch 'master' into laraib/components/postForm
fe2f423
@vyshudoulagar
Merge pull request #11 from bhood239/laraib/components/postForm
53fca8d 
Change ruby version in gemfile
@vyshudoulagar
use custom hooks to update status
ed21d42
@bhood239
Merge pull request #8 from bhood239/vyshnavi/components/registerpage
5487a8a 
Vyshnavi/components/registerpage
@bhood239
fixing merge conflicts
d7018cd 
Merge branch 'master' into vyshnavi/components/booklistapi
@bhood239
Merge pull request #7 from bhood239/vyshnavi/components/booklistapi
818e1b0 
Vyshnavi/components/booklistapi
@vyshudoulagar
correct the links of imported files, update booklist to use custom ho…
722763a 
…oks correctly
@bhood239
Merge branch 'master' into Holina/TopNav/footer
18d049b
@bhood239 bhood239 deleted the Holina/TopNav/footer branch August 13, 2024 19:06
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@Millington-Holi7 @bhood239 @laraibsshaikh10 @vyshudoulagar